api/admin_views.py

@@ -7,14 +7,14 @@ from collections import defaultdict

                 from datetime import datetime
              

                 
              

                 from django.conf import settings
              

                +from django.contrib.auth.hashers import make_password
              

                 from django.db import transaction
              

                 from django.db.models import Count, Q, Sum
              

                 from django_logit import logit
              

                 from django_response import response
              

                -from django.contrib.auth.hashers import make_password
              

                 from paginator import pagination
              

                -from TimeConvert import TimeConvert as tc
              

                 from pysnippets.strsnippets import strip
              

                +from TimeConvert import TimeConvert as tc
              

                 
              

                 from account.models import UserInfo
              

                 from api.encrypt_views import get_ciphertext
              
@@ -1688,7 +1688,7 @@ def administrator_create(request):

                 
              

                     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
              

                         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
              

                -    
              

                +
              

                     encryption = make_password(strip(password), settings.MAKE_PASSWORD_SALT, settings.MAKE_PASSWORD_HASHER)
              

                 
              

                     AdministratorInfo.objects.create(
              
@@ -1753,8 +1753,7 @@ def administrator_delete(request):

                 
              

                     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
              

                         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
              

                -    
              

                -    
              

                +
              

                     AdministratorInfo.objects.filter(admin_id=target_admin_id).update(status=False)
              

                 
              

                     return response(200, 'Delete Admin Success', u'删除后台管理员成功')
              

api/maintenance_views.py

@@ -399,7 +399,7 @@ def maintenance_close(request):

                 
              

                     if not is_admin(brand_id, admin_id):
              

                         return response(MaintenanceStatusCode.MAINTENACE_NOT_FOUND)
              

                -    
              

                +
              

                     maintenance.maintenance_status = MaintenaceInfo.TRACKING_BACK_SIGNED
              

                     maintenance_status_at = maintenance.maintenance_status_at
              

                     maintenance_status_at[MaintenaceInfo.TRACKING_BACK_SIGNED] = tc.utc_datetime()